merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 23 Sep 2012 07:41:08 +0000 (16:41 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 23 Sep 2012 07:41:08 +0000 (16:41 +0900)
commit350234dc7e70629a88f3e5dd7da5004c3dcbf289
treea6fd65f5116beb65e4b54cfe52272f284839f55d
parent05d11beaf0d82bd1599ee310af50d74a6e55fe09
parent909da03280b8c093b237856249d7bc040a47c6f9
merge trunk